Revert "theme: have a separate state for hover and focus"

As per discussion in bug #745246 this reverts
commit 8a732d3c1354183c84138ba97f3c61d4e1a82f44.

diff --git a/data/theme/gnome-shell-high-contrast.css b/data/theme/gnome-shell-high-contrast.css
index 4a98360f7ef9ea8875c7990c031ad7887f58e515..ce1a87c155594942a17c5740b2163a801cf94382 100644 (file)
--- a/data/theme/gnome-shell-high-contrast.css
+++ b/data/theme/gnome-shell-high-contrast.css
@@ -392,12 +392,9 @@ StScrollBar {
       background-color: black;
       box-shadow: inset 0 1px 0px #0d0d0d;
       font-weight: bold; }
-    .popup-menu .popup-menu-item:focus {
+    .popup-menu .popup-menu-item:hover {
       background-color: #215d9c;
       color: #ffffff; }
-    .popup-menu .popup-menu-item:hover {
-      background-color: rgba(255, 255, 255, 0.1);
-      color: #fff; }
     .popup-menu .popup-menu-item:active {
       background-color: #1c5187;
       color: #ffffff; }

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 2c2d58cb134c5ddf145b5d5644c3e4fc1937ce7e..9338032351f5b1754b546c954a11582ab36c57f6 100644 (file)
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -392,12 +392,9 @@ StScrollBar {
       background-color: #343a3a;
       box-shadow: inset 0 1px 0px #282c2c;
       font-weight: bold; }
-    .popup-menu .popup-menu-item:focus {
+    .popup-menu .popup-menu-item:hover {
       background-color: #215d9c;
       color: #ffffff; }
-    .popup-menu .popup-menu-item:hover {
-      background-color: rgba(238, 238, 236, 0.1);
-      color: #eeeeec; }
     .popup-menu .popup-menu-item:active {
       background-color: #1c5187;
       color: #ffffff; }